From: Simon McVittie Date: Sat, 29 Oct 2022 10:54:05 +0000 (+0100) Subject: d/patches: Remove patches that were applied upstream X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~45 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6dd278f7d80961e25998a1a52fbf21640d74a0e6;p=gtk4.git d/patches: Remove patches that were applied upstream --- diff --git a/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch b/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch deleted file mode 100644 index 316172f74a..0000000000 --- a/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Simon McVittie -Date: Sat, 17 Sep 2022 21:50:38 +0100 -Subject: build: Use more conservative GResource embedding on non-x86_64 - -Doing clever things with objcopy is faster and seems to be reliable on -x86_64 Linux, but also doesn't work on all toolchains and architectures: -in particular, Debian has had trouble with this on arm and mips. -In a distro build environment where we are compiling all of GTK every -time, the cost of potentially unreliable builds is higher than the cost -of using slower but more conservative GResource embedding. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5107 -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4956 -Applied-upstream: 4.9.0, commit:60a83a51c3c3ae926df991a1e92a61a6129adaa6 ---- - gtk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/meson.build b/gtk/meson.build -index 080bffe..225b0b8 100644 ---- a/gtk/meson.build -+++ b/gtk/meson.build -@@ -877,7 +877,7 @@ endif - - ld = find_program('ld', required : false) - --if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() -+if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() - glib_compile_resources = find_program('glib-compile-resources') - - # Create the resource blob diff --git a/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch b/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch deleted file mode 100644 index 34c32bab3a..0000000000 --- a/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Simon McVittie -Date: Sat, 17 Sep 2022 18:53:00 +0100 -Subject: gdkevents: Don't ignore modifiers that are not currently active - -The X11 backend can mark modifiers like Shift as consumed even if they -aren't actually active, which seems to be something to do with making -shortcuts like `plus` and `plus` work as -intended regardless of whether the plus symbol is obtained by pressing -Shift and a key (like `+/=` on American, British or French keyboards) -or not (like `*/+` on German keyboards). - -However, this can go badly wrong when the modifier is *not* pressed. -For example, terminals normally have separate bindings for `c` -(send SIGINT) and `c` (copy). If we disregard the -consumed modifiers completely, when the X11 backend marks Shift as -consumed, pressing Ctrl+c would send SIGINT *and* copy to the clipboard, -which is not what was intended. - -By masking out the members of `consumed` that are not in `state`, we -get the same interpretation for X11 and Wayland, and ensure that -keyboard shortcuts that explicitly mention Shift can only be triggered -while holding Shift. It continues to be possible to trigger keyboard -shortcuts that do not explicitly mention Shift (such as `plus`) -while holding Shift, if the backend reports Shift as having been -consumed in order to generate the plus keysym. - -Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5095 -Bug-Debian: https://bugs.debian.org/1016927 -Signed-off-by: Simon McVittie -Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5037 -Applied-upstream: 4.9.0, commit:79285bd63ee9834c2e77ff9639d14a4cd6b7c3c8 ---- - gdk/gdkevents.c | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c -index 4b61715..0daf475 100644 ---- a/gdk/gdkevents.c -+++ b/gdk/gdkevents.c -@@ -1773,7 +1773,7 @@ gdk_key_event_matches (GdkEvent *event, - guint ev_keyval; - int layout; - int level; -- GdkModifierType consumed_modifiers; -+ GdkModifierType ignored_modifiers; - GdkModifierType shift_group_mask; - gboolean group_mod_is_accel_mod = FALSE; - const GdkModifierType mask = GDK_CONTROL_MASK | -@@ -1792,7 +1792,23 @@ gdk_key_event_matches (GdkEvent *event, - ev_keyval = self->translated[1].keyval; - layout = self->translated[1].layout; - level = self->translated[1].level; -- consumed_modifiers = self->translated[1].consumed; -+ -+ /* -+ * If a modifier is currently active (e.g. Shift is pressed) and was marked -+ * as consumed, we ignore it for the purposes of matching shortcuts. -+ * For example, when Ctrl+Shift+[plus/equals key] is translated into -+ * Ctrl+plus on a keyboard where Shift+equals is the plus sign, we want -+ * shortcuts for either plus or plus to match. -+ * (See https://bugzilla.gnome.org/show_bug.cgi?id=100439) -+ * -+ * If a modifier is *not* currently active, the X11 backend can sometimes -+ * mark it as consumed where the Wayland and Windows backends do not. -+ * In this case, we still want to pay attention to its state. -+ * For example, when Ctrl+x is translated into Ctrl+x, we only want to -+ * trigger shortcuts for x, not for x. -+ * (See https://gitlab.gnome.org/GNOME/gtk/-/issues/5095) -+ */ -+ ignored_modifiers = (self->translated[1].consumed & state); - - /* if the group-toggling modifier is part of the default accel mod - * mask, and it is active, disable it for matching -@@ -1804,7 +1820,7 @@ gdk_key_event_matches (GdkEvent *event, - if (mask & shift_group_mask) - group_mod_is_accel_mod = TRUE; - -- if ((modifiers & ~consumed_modifiers & mask) == (state & ~consumed_modifiers & mask)) -+ if ((modifiers & ~ignored_modifiers & mask) == (state & ~ignored_modifiers & mask)) - { - /* modifier match */ - GdkKeymapKey *keys; diff --git a/debian/patches/series b/debian/patches/series index 7489065cf9..018c40f418 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch -build-Use-more-conservative-GResource-embedding-on-non-x8.patch reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch debian/Disable-clipboard-test.patch